Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:30:01 +0000 (09:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:30:01 +0000 (09:30 -0700)

Trivial merge